merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Mon, 18 Dec 2006 17:56:34 +0000 (10:56 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Mon, 18 Dec 2006 17:56:34 +0000 (10:56 -0700)
commitf4556d236293d4b8965d47f2c9651d6f0f68e8a7
treec0ae4cfe1d211725e43140faf2d69efb335b89e1
parent5fb6147b15fabf3ec20644ebcee07422633179b9
parent75bbf9d488782d227fb6648adb351192dba5a7b5
merge with xen-unstable.hg